From 212c46e20ae2f2f2fef42749e5013a3a06cd5fc3 Mon Sep 17 00:00:00 2001
From: Benjamin Otte <otte@redhat.com>
Date: Wed, 2 Aug 2017 16:58:05 +0100
Subject: [PATCH] a11y: Remove check for GtkEventBox

---
 gtk/a11y/gtktoplevelaccessible.c | 31 +------------------------------
 1 file changed, 1 insertion(+), 30 deletions(-)

diff --git a/gtk/a11y/gtktoplevelaccessible.c b/gtk/a11y/gtktoplevelaccessible.c
index b925f30df2..1512d6fe75 100644
--- a/gtk/a11y/gtktoplevelaccessible.c
+++ b/gtk/a11y/gtktoplevelaccessible.c
@@ -20,7 +20,6 @@
 #include <stdlib.h>
 #include <string.h>
 
-#include <gtk/gtkeventbox.h>
 #include <gtk/gtkscrolledwindow.h>
 #include <gtk/gtkframe.h>
 #include <gtk/gtkmenu.h>
@@ -92,33 +91,6 @@ gtk_toplevel_accessible_get_name (AtkObject *obj)
   return g_get_prgname ();
 }
 
-static gboolean
-is_combo_window (GtkWidget *widget)
-{
-  GtkWidget *child;
-  AtkObject *obj;
-
-  child = gtk_bin_get_child (GTK_BIN (widget));
-
-  if (!GTK_IS_EVENT_BOX (child))
-    return FALSE;
-
-  child = gtk_bin_get_child (GTK_BIN (child));
-
-  if (!GTK_IS_FRAME (child))
-    return FALSE;
-
-  child = gtk_bin_get_child (GTK_BIN (child));
-
-  if (!GTK_IS_SCROLLED_WINDOW (child))
-    return FALSE;
-
-  obj = gtk_widget_get_accessible (child);
-  obj = atk_object_get_parent (obj);
-
-  return FALSE;
-}
-
 static gboolean
 is_attached_menu_window (GtkWidget *widget)
 {
@@ -206,8 +178,7 @@ show_event_watcher (GSignalInvocationHint *ihint,
 
   widget = GTK_WIDGET (object);
   if (gtk_widget_get_parent (widget) ||
-      is_attached_menu_window (widget) ||
-      is_combo_window (widget))
+      is_attached_menu_window (widget))
     return TRUE;
 
   child = gtk_widget_get_accessible (widget);
-- 
2.30.2